From 1c3475d58a2c82201d39a5086241da6da398a642 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Fri, 24 Oct 2014 13:01:41 +0200 Subject: [PATCH] Revert "Adwaita: axes borders of notebooks inside frame" This reverts commit 01e6811776cf6ad8738f182972edbb84626d7fae. This assumption doesn't work latelly --- gtk/resources/theme/Adwaita/_common.scss | 5 +---- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 2 -- gtk/resources/theme/Adwaita/gtk-contained.css | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 0151676003..38f6e4abc1 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1564,9 +1564,9 @@ column-header.button.dnd { // for treeview-like derive widgets &.left { border-left-width: 0; } &:backdrop { border-color: $backdrop_borders_color; } } - &.header { // FIXME: double borders in some case, can't fix it w/o a class tho + // FIXME: doesn't work on dark var background-color: mix($bg_color, $borders_color, 70%); // this is the shading of the header behind the tabs @@ -1606,9 +1606,6 @@ column-header.button.dnd { // for treeview-like derive widgets box-shadow: none; } } - - .frame > &.frame { border: none; } // axes borders when the notebook is inside a frame - tab { border-width: 0; border-style: solid; diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 9c85dfd47f..b33c94ebff 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -2248,8 +2248,6 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove .notebook.header:backdrop { background-color: #2f3434; box-shadow: none; } - .frame > .notebook.frame { - border: none; } .notebook tab { border-width: 0; border-style: solid; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index d318c0b6f1..f4b199c83d 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -2245,8 +2245,6 @@ GtkCalendar.header column-header .button.titlebutton, column-header .button:hove .notebook.header:backdrop { background-color: #d4d4d4; box-shadow: none; } - .frame > .notebook.frame { - border: none; } .notebook tab { border-width: 0; border-style: solid; -- 2.30.2